[XEN][POWERPC] more ofd /cpus fixups

Correct comment on why we prune secondary processors on the devtree.
Get rid of a particularly annoying non-standard cpu property.

Signed-off-by: Jimi Xenidis <jimix@watson.ibm.com>
--HG--
extra : transplant_source : %AEPJI%92%3C%D7%D4D%60%22%F3%00I%8D%95%27%1F%FB%D1

diff --git a/xen/arch/powerpc/ofd_fixup.c b/xen/arch/powerpc/ofd_fixup.c
index d4cae92f311c5056b2794400870799d9996469d8..992ab8c06623d9f6a6a87e8a237332e695905103 100644 (file)
--- a/xen/arch/powerpc/ofd_fixup.c
+++ b/xen/arch/powerpc/ofd_fixup.c
@@ -178,12 +178,21 @@ static ofdn_t ofd_cpus_props(void *m, struct domain *d)
     if (ofd_boot_cpu == -1)
         ofd_boot_cpu = c;
     while (c > 0) {
-        /* Since we are not MP yet we prune all but the booting cpu */
+        /* We do not use the OF tree to identify secondary processors
+         * so we must prune them from the tree */
         if (c == ofd_boot_cpu) {
+            ofdn_t p;
+
             ibm_pft_size[1] = d->arch.htab.log_num_ptes + LOG_PTE_SIZE;
             ofd_prop_add(m, c, "ibm,pft-size",
                          ibm_pft_size, sizeof (ibm_pft_size));
 
+            /* get rid of non-standard properties */
+            p = ofd_prop_find(m, c, "cpu#");
+            if (p > 0) {
+                ofd_prop_remove(m, c, p);
+            }
+
             /* FIXME: Check the the "l2-cache" property who's
              * contents is an orphaned phandle? */
         } else